<<<<<<< HEAD
import Vue from 'vue'
import VueRouter from 'vue-router'
import HomeView from '../views/HomeView.vue'
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> upstream/master
import AboutView from '../views/AboutView.vue'
import TopPlaylistNew from '../components/home/TopPlaylistNew.vue'
import FinishSong from '../components/song/FinishSong.vue'
import NewSong from '../components/home/NewSong.vue'
import HomeInput from '../components/home/HomeInput.vue'
import HomeTabbar from '../components/home/HomeTabbar.vue'
import HomeNavbar from '../components/home/HomeNavbar.vue'
<<<<<<< HEAD

=======
>>>>>>> upstream/master

=======
// import RankView from '../views/RankView'
import SingerHome from '../components/singer/SingerHome.vue'
>>>>>>> upstream/master
Vue.use(VueRouter)

const routes = [
  {
    path: '/',
    name: 'home',
    component: HomeView
  },
  // {
  //   path: '/singer/:id',
  //   name: 'singer',
  //   component: SingerHome
  // },
  {
    path: '/',
    name: 'home',
    component: HomeView
  },
  {
    path: '/singer/:id',
    name: 'singer',
    component: SingerHome
  }
  // {
  //   path: '/rank',
  //   name: 'rank',
  //   // route level code-splitting
  //   // this generates a separate chunk (about.[hash].js) for this route
  //   // which is lazy-loaded when the route is visited.
  //   component: RankView
  // }
]

const router = new VueRouter({
  mode: 'history',
  base: process.env.BASE_URL,
  routes
})

export default router
=======
import Vue from 'vue'
import VueRouter from 'vue-router'
import HomeView from '../views/HomeView.vue'
import AboutView from '../views/AboutView.vue'


Vue.use(VueRouter)

const routes = [
  {
    path: '/',
    name: 'home',
    component: HomeView
  },
<<<<<<< HEAD
 
=======
  {
    path: '/about',
    name: 'about',
    component: AboutView
<<<<<<< HEAD
=======
    // route level code-splitting
    // this generates a separate chunk (about.[hash].js) for this route
    // which is lazy-loaded when the route is visited.
<<<<<<< HEAD
    // component: () => import(/* webpackChunkName: "about" */ '../views/AboutView.vue')
>>>>>>> upstream/master
  },
  {
    path: '/topplaylistnew',
    name: 'topplaylistnew',
    component: TopPlaylistNew
  },
  {
    path: '/newsong',
    name: 'newsong',
    component: NewSong
  },
  {
    path: '/finishsong',
    name: 'finishsong',
    component: FinishSong
  },
  {
    path: '/homeinput',
    name: 'homeinput',
    component: HomeInput
  },
  {
    path: '/hometabbar',
    name: 'hometabbar',
    component: HomeTabbar
  },
  {
    path: '/homenavbar',
    name: 'homenavbar',
    component: HomeNavbar
  },
<<<<<<< HEAD
  {
    path: '/radioStation',
    name: 'radioStation',
    component: () => import('@/components/radioStation/index'),
  }
  
=======

=======
    // 
    component: AboutView
  }
>>>>>>> upstream/master
>>>>>>> upstream/master
>>>>>>> upstream/master
]

const router = new VueRouter({
  mode: 'history',
  base: process.env.BASE_URL,
  routes
})

export default router
>>>>>>> upstream/master
